Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 00:01:45 +0000 (17:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 00:01:45 +0000 (17:01 -0700)

Trivial merge